diff --git a/templates/archives.html b/templates/archives.html
index 8115d9e..498a3c0 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}{{ SITENAME }} - Archives{% endblock %}
+{% block title %}Archives{% endblock %}
 {% block content %}
 <article>
   <div id="article_text">
diff --git a/templates/article.html b/templates/article.html
index 52dc6a3..6c67492 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,5 +1,8 @@
 {% extends "base.html" %}
-{% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
+{% block head %}
+<meta name="keywords" content="{{ article.tags|join(', ')  }}">
+{% endblock %}
+{% block title %}{{ article.title }}{% endblock %}
 {% block header %}
 Posted on {{ article.locale_date }}
 {% endblock %}
diff --git a/templates/author.html b/templates/author.html
index eb36f8f..f729e3b 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -1,5 +1,5 @@
 {% extends "index.html" %}
-{% block title %}{{ SITENAME }} - Author: {{ author }}{% endblock %}
+{% block title %}Author: {{ author }}{% endblock %}
 {% block header %}
 Author: {{ author }}
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 64a5cf7..6a137ef 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -11,6 +11,8 @@
 
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width; initial-scale=1.0">
+  <meta name="author" content="{{ AUTHOR }}">
+  <meta name="description" content="Posts and writings by {{ AUTHOR }}">
 
   {% if FEED_ALL_ATOM %}
   <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
diff --git a/templates/categories.html b/templates/categories.html
index 7046137..871964e 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}{{ SITENAME }} - Categories{% endblock %}
+{% block title %}Categories{% endblock %}
 {% block content %}
 <article>
   <div id="article_text">
diff --git a/templates/category.html b/templates/category.html
index b82a7d4..c335d69 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -1,5 +1,5 @@
 {% extends "index.html" %}
-{% block title %}{{ SITENAME }} - Category: {{ category }}{% endblock %}
+{% block title %}Category: {{ category }}{% endblock %}
 {% block head %}
 {% if CATEGORY_FEED_ATOM %}
 <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ category }} Category Atom Feed" />
diff --git a/templates/page.html b/templates/page.html
index 90f04e6..d293b1a 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}{{ SITENAME }} - {{ page.title }}{% endblock %}
+{% block title %}{{ page.title }}{% endblock %}
 {% block header %}
 {{ page.title }
 {% endblock %}
diff --git a/templates/tag.html b/templates/tag.html
index 004be31..33ec583 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -1,5 +1,5 @@
 {% extends "index.html" %}
-{% block title %}{{ SITENAME }} - Tag: {{ tag }}{% endblock %}
+{% block title %}Tag: {{ tag }}{% endblock %}
 {% block head %}
 {% if TAG_FEED_ATOM %}
 <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag Atom Feed" />
diff --git a/templates/tags.html b/templates/tags.html
index e621ad1..b08aae2 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}{{ SITENAME }} - Tags{% endblock %}
+{% block title %}Tags{% endblock %}
 {% block content %}
 <article>
   <div id="article_text">